From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sun, 20 Oct 2013 12:00:16 +0000 (+0200)
Subject: st-widget: Use g_clear_pointer
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3186
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4d1358b7ed483b3822ab889e4851cca2c3fa8841;p=gnome-shell.git

st-widget: Use g_clear_pointer

https://bugzilla.gnome.org/show_bug.cgi?id=710541
---

diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 15f45f6b0..9b1226ecb 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -338,17 +338,8 @@ st_widget_dispose (GObject *gobject)
   StWidget *actor = ST_WIDGET (gobject);
   StWidgetPrivate *priv = ST_WIDGET (actor)->priv;
 
-  if (priv->theme)
-    {
-      g_object_unref (priv->theme);
-      priv->theme = NULL;
-    }
-
-  if (priv->theme_node)
-    {
-      g_object_unref (priv->theme_node);
-      priv->theme_node = NULL;
-    }
+  g_clear_pointer (&priv->theme, g_object_unref);
+  g_clear_pointer (&priv->theme_node, g_object_unref);
 
   st_widget_remove_transition (actor);
 
@@ -358,11 +349,7 @@ st_widget_dispose (GObject *gobject)
   if (priv->accessible)
     priv->accessible = NULL;
 
-  if (priv->label_actor)
-    {
-      g_object_unref (priv->label_actor);
-      priv->label_actor = NULL;
-    }
+  g_clear_pointer (&priv->label_actor, g_object_unref);
 
   if (priv->texture_file_changed_id != 0)
     {